git merge tool

visit shbcf.ru